Auto merge of #1770 - alexcrichton:shell, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 1 Jul 2015 00:41:14 +0000 (00:41 +0000)
committerbors <bors@rust-lang.org>
Wed, 1 Jul 2015 00:41:14 +0000 (00:41 +0000)
Tweaked version of https://github.com/rust-lang/cargo/pull/1673.


Trivial merge